8f8b7b4ae671e68855fc54cbc69f33b3aa4e6de4,subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java,ScalaCompilerFactory,create,#ScalaCompileOptions#CompileOptions#,43

Before Change


            throw new RuntimeException("Failed to dynamically load ZincScalaCompiler", e);
        }
        CompilerDaemonFactory daemonFactory;
        if (scalaOptions.isFork()) {
            daemonFactory = CompilerDaemonManager.getInstance();
        } else {
            daemonFactory = InProcessCompilerDaemonFactory.getInstance();
        }
        scalaCompiler = new DaemonScalaCompiler(project, scalaCompiler, daemonFactory);
        return new NormalizingScalaCompiler(scalaCompiler);

After Change


            return new DefaultScalaJavaJointCompiler(scalaCompiler, javaCompiler);
        }

        if (!scalaOptions.isFork()) {
            throw new GradleException("The Zinc based Scala compiler ('scalaCompileOptions.useAnt=false') "
                    + "requires forking ('scalaCompileOptions.fork=true'), but the latter is set to 'false'.");
        }

        // currently, we leave it to ZincScalaCompiler to also compile the Java code
        Compiler<ScalaJavaJointCompileSpec> scalaCompiler;
        try {
            scalaCompiler = (Compiler<ScalaJavaJointCompileSpec>) getClass().getClassLoader()
                    .loadClass("org.gradle.api.internal.tasks.scala.jdk6.ZincScalaCompiler").newInstance();
        } catch (Exception e) {
            throw new RuntimeException("Internal error: Failed to load org.gradle.api.internal.tasks.scala.jdk6.ZincScalaCompiler", e);
        }

        CompilerDaemonFactory daemonFactory = CompilerDaemonManager.getInstance();
        scalaCompiler = new DaemonScalaCompiler(project, scalaCompiler, daemonFactory);
        return new NormalizingScalaCompiler(scalaCompiler);
    }